vtk9 (9.6.2+dfsg1-1exp1) UNRELEASED; urgency=medium
* New upstream release
+ - applies debian patches 40_viskores.patch,
+ findEXPAT_version_fix_MR12826.patch,
+ numpy_drop_in1d_MR12693.patch
* provide debian/python3-vtk9.pydist to declare python3-vtk9 as
python package vtk. Closes: #1096135
* Depends: libmariadbclient-dev rather than default-libmysqlclient-dev
+++ /dev/null
-Description: Fix viskores warning
- /vtk9/ThirdParty/viskores/vtkviskores/viskores/viskores/cont/tbb/internal/RuntimeDeviceConfigurationTBB.h:49:66: warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor]
- 49 | RuntimeDeviceConfiguration<viskores::cont::DeviceAdapterTagTBB>()
-Author: Dominique Belhachemi <domibel@debian.org>
-Last-Update: 2025-09-25
-
---- vtk9-9.5.2+dfsg2.orig/ThirdParty/viskores/vtkviskores/viskores/viskores/cont/tbb/internal/RuntimeDeviceConfigurationTBB.h
-+++ vtk9-9.5.2+dfsg2/ThirdParty/viskores/vtkviskores/viskores/viskores/cont/tbb/internal/RuntimeDeviceConfigurationTBB.h
-@@ -46,7 +46,7 @@ class RuntimeDeviceConfiguration<viskore
- {
- public:
- VISKORES_CONT
-- RuntimeDeviceConfiguration<viskores::cont::DeviceAdapterTagTBB>()
-+ RuntimeDeviceConfiguration()
- :
- #if TBB_VERSION_MAJOR >= 2020
- HardwareMaxThreads(::tbb::task_arena{}.max_concurrency())
+++ /dev/null
-From b4d87554cf82db109b21e905fb57df05df8adbdc Mon Sep 17 00:00:00 2001
-From: Julien Schueller <schueller@phimeca.com>
-Date: Mon, 19 Jan 2026 14:49:34 +0100
-Subject: [PATCH] CMake: Fix EXPAT version warning
-
-Closes #19679
----
- CMake/FindEXPAT.cmake | 11 ++++++-----
- ThirdParty/expat/CMakeLists.txt | 7 ++++---
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-Index: vtk9/CMake/FindEXPAT.cmake
-===================================================================
---- vtk9.orig/CMake/FindEXPAT.cmake 2026-01-30 11:52:41.673450703 +0100
-+++ vtk9/CMake/FindEXPAT.cmake 2026-01-30 11:52:41.664769177 +0100
-@@ -43,25 +43,26 @@
- file(STRINGS "${EXPAT_INCLUDE_DIR}/expat.h" expat_version_str
- REGEX "^#[\t ]*define[\t ]+XML_(MAJOR|MINOR|MICRO)_VERSION[\t ]+[0-9]+$")
-
-- unset(EXPAT_VERSION_STRING)
-+ unset(EXPAT_VERSION)
- foreach(VPART MAJOR MINOR MICRO)
- foreach(VLINE ${expat_version_str})
- if(VLINE MATCHES "^#[\t ]*define[\t ]+XML_${VPART}_VERSION[\t ]+([0-9]+)$")
- set(EXPAT_VERSION_PART "${CMAKE_MATCH_1}")
-- if(EXPAT_VERSION_STRING)
-- string(APPEND EXPAT_VERSION_STRING ".${EXPAT_VERSION_PART}")
-+ if(EXPAT_VERSION)
-+ string(APPEND EXPAT_VERSION ".${EXPAT_VERSION_PART}")
- else()
-- set(EXPAT_VERSION_STRING "${EXPAT_VERSION_PART}")
-+ set(EXPAT_VERSION "${EXPAT_VERSION_PART}")
- endif()
- endif()
- endforeach()
- endforeach()
-+ set(EXPAT_VERSION_STRING ${EXPAT_VERSION})
- endif ()
-
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT
- REQUIRED_VARS EXPAT_LIBRARY EXPAT_INCLUDE_DIR
-- VERSION_VAR EXPAT_VERSION_STRING)
-+ VERSION_VAR EXPAT_VERSION)
-
- # Copy the results to the output variables and target.
- if(EXPAT_FOUND)
-Index: vtk9/ThirdParty/expat/CMakeLists.txt
-===================================================================
---- vtk9.orig/ThirdParty/expat/CMakeLists.txt 2026-01-30 11:52:41.673450703 +0100
-+++ vtk9/ThirdParty/expat/CMakeLists.txt 2026-01-30 11:52:41.665061302 +0100
-@@ -16,7 +16,8 @@
- PACKAGE EXPAT
- VERSION 2.5.0
- TARGETS EXPAT::EXPAT
-- STANDARD_INCLUDE_DIRS)
-+ STANDARD_INCLUDE_DIRS
-+ USE_VARIABLES EXPAT_VERSION)
-
- include(vtkDetectLibraryType)
- vtk_detect_library_shared(vtkexpat EXPAT::EXPAT)
-@@ -42,9 +43,9 @@
- if(NOT DEFINED ENV{DASHBOARD_TEST_FROM_CTEST})
- # Check for deprecated versions of expat
- set(expat_deprecated_version "2.6.3")
-- if(VTK_MODULE_USE_EXTERNAL_vtkexpat AND EXPAT_VERSION_STRING VERSION_LESS expat_deprecated_version)
-+ if(VTK_MODULE_USE_EXTERNAL_vtkexpat AND EXPAT_VERSION VERSION_LESS expat_deprecated_version)
- message(DEPRECATION
-- "External expat ${EXPAT_VERSION_STRING} is less than ${expat_deprecated_version} "
-+ "External expat ${EXPAT_VERSION} is less than ${expat_deprecated_version} "
- "and (may) have known vulnerabilities. Consider upgrading.")
- endif()
- endif()
+++ /dev/null
-From 0f9b0ce9fad6bc42a1a69076a32b08ad161adc16 Mon Sep 17 00:00:00 2001
-From: Guillaume Gisbert <guillaume.gisbert@kitware.com>
-Date: Mon, 8 Dec 2025 09:06:41 +0100
-Subject: [PATCH 1/2] Remove deleted numpy function in1d
-
----
- Wrapping/Python/vtkmodules/numpy_interface/algorithms.py | 3 ---
- Wrapping/Python/vtkmodules/numpy_interface/numpy_algorithms.py | 3 ---
- 2 files changed, 6 deletions(-)
-
-Index: vtk9/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py
-===================================================================
---- vtk9.orig/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py 2026-05-25 21:03:24.243777846 +0200
-+++ vtk9/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py 2026-05-25 21:05:08.618648422 +0200
-@@ -981,8 +981,8 @@
- ugrid.GetPointData().AddArray(da)
- return ugrid
-
--in1d = _make_ufunc(numpy.in1d)
--in1d.__doc__ = "Test whether each element of a 1-D array is also present in a second array."
-+isin = _make_ufunc(numpy.isin)
-+isin.__doc__ = "Test whether each element of a 1-D array is also present in a second array."
-
- isnan = _make_ufunc(numpy.isnan)
- isnan.__doc__ = "Returns a bool array, true if values is nan."
-Index: vtk9/Common/Core/Testing/Python/TestNumpyInterface.py
-===================================================================
---- vtk9.orig/Common/Core/Testing/Python/TestNumpyInterface.py 2026-05-25 21:03:24.243777846 +0200
-+++ vtk9/Common/Core/Testing/Python/TestNumpyInterface.py 2026-05-25 21:04:07.865986076 +0200
-@@ -119,7 +119,7 @@
- compare(algs.cos(randomVec) - numpy.cos(npa), 1E-7)
- assert algs.cos(randomVec).DataSet is randomVec.DataSet
-
--assert algs.in1d(elev, [0,1]) == [item in [0, 1] for item in elev]
-+assert algs.isin(elev, [0,1]) == [item in [0, 1] for item in elev]
-
- # Various numerical ops implemented in VTK
- g = algs.gradient(elev)
10_matplotlib.patch
20_do_not_link_against_socket.patch
30_drop_medical_example.patch
-40_viskores.patch
50_fix_python-modules_path.patch
60_fix_path_perl.patch
80_fix_ppc64_ftbfs.patch
99_fix_ftbfs.patch
100_add_missing_gl_header.patch
121_add_support_for_loong64.patch
-findEXPAT_version_fix_MR12826.patch
matplotlib_nullptr_s390x.patch
gdal-3.13.patch
-numpy_drop_in1d_MR12693.patch